Remove conflict markers.
authorMatthias Clasen <matthiasc@src.gnome.org>
Tue, 16 Mar 2004 00:03:59 +0000 (00:03 +0000)
committerMatthias Clasen <matthiasc@src.gnome.org>
Tue, 16 Mar 2004 00:03:59 +0000 (00:03 +0000)
commitc397238109eb3abc855814cb07e931c73b530c5f
treee5cdcf9e1b121d40b2f12010af453f2ad5fa5117
parentbf86da9df0fc8297b2b6e6c7ac14c54b9023f6da
Remove conflict markers.
docs/reference/ChangeLog
docs/reference/gtk/tmpl/gtktreestore.sgml